Port changes of MR1275 of float repo to BASOP code.

Merge request reports

Loading