[non-BE] [renderer-non-BE] [split-non-BE] [allow-regression] Port branch 3gpp_issue_1517_fix to main-pc (was lost)