Merge remote-tracking branch 'origin/ivas-float-update' into 1680_ref-porting-mr-234-object-editing