Merge branch '2179-basop-non-be-difference-in-basop-of-be-port-376' into 'main'

[non-BE] Non-BE difference in BASOP of BE port 376 to BASOP main

Closes #2179

See merge request !2503