Merge remote-tracking branch 'remotes/origin/1954-ref-PortFlpMr2069' into 1955-ref-PortMr2077-from-float-revision-of-common-api-types