[Non-BE][split-non-be][allow-regression]PATCH MR1276 into main-pc. See merge request !967
mentioned in issue #1471