Merge branch '3gpp_issue_1724_fix_3' into 'main'

Fix for 3GPP issue 1724: Renderer MASA output metadata difference - 2

See merge request !1837