jira: STUDIO-11327 Change-Id: I44a43d67ff909768f5e652a687883742ece14737 (cherry picked from commit dbaec237c4e53b9e93901f21274c729d79cce2d5)
jira: none Change-Id: Iaf3529345f688f2dbdc35c16f45253a5b65feb84 (cherry picked from commit 5e2861acca8d86d6e7012f73d3f739877eb05069)