Merge branch 'float-pc' into 1571_ref_fix_diffs_between_framesizes