[non-BE][split-non-BE]1894 ref port 298 355 360 See merge request !2065
mentioned in issue #1909 (closed)