Merge branch '1675_basop_portFlp1736' into 'main'

[non-BE] [allow-regression] Port FLP MR 1736 to main

Closes #1675

See merge request !2095