JIRA: STUDIO-10718 Change-Id: I0f0c1c12a0126dee18c92baf7da8494c5b280ae1 (cherry picked from commit e28346c0356aeb42c4e53661d2ccd72135d4dede)
JIRA: none Change-Id: I507a92abb9137167dbcbe1def8276f868529c4ab (cherry picked from commit 99a8139c1b915709a854296f22a222bac07a47ce)