Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 2179-ref-non-be-difference-in-basop-of-be-port-376
