Merge "Correctly initialize the noise phase" into sc-dev