Merge branch 'float-pc' into 1532_ref_ISM_downmix_energies