Merge remote-tracking branch 'origin/ivas-float-update' into 1964_ref_port_mr_1700_masa_rateswitch_to_13_2_16_4