Merge branch '1825_basop_PortFlp1531' into 'main'

[Renderer Non-BE][split-non-be][Non-BE] 1825 basop port flp1531

See merge request !1924