Merge remote-tracking branch 'origin/ivas-float-update' into 1878_ref_port_mr_1770_mcmasa_indexing_bug