Merge "Quantum client should not be conditional"