Merge branch '1565_basop_PortFlpMR1504' into 'main'

Port MR 1504 to main-pc [non-BE]

Closes #1565

See merge request !1552