Merge remote-tracking branch 'origin/ivas-float-update' into 1974_ref_port_mr1965_msan_masa_ext