jira: STUDIO-9592 Change-Id: I1e6b0cc04f3dba8578b5c59eeb1d24ba522f0c72 (cherry picked from commit dec14c4bac748c894c91d796eeaf1ee698973b12)
jira: STUDIO-9592 Change-Id: I1e6b0cc04f3dba8578b5c59eeb1d24ba522f0c72 (cherry picked from commit dec14c4bac748c894c91d796eeaf1ee698973b12)