Merge remote-tracking branch 'origin/ivas-float-update' into 2163_ref_port_mr_2246_masa_prerend_samplerates # Conflicts: # lib_com/options.h
