PML-380: Unitary device fix for g2#283

CassNot merged 4 commits into

merlinquantum:release/0.4.1merlinquantum/merlin:release/0.4.1from

LF-Vigneux:PML-380-unitary-g2-deviceLF-Vigneux/merlin:PML-380-unitary-g2-deviceCopy head branch name to clipboard