jira: STUDIO-12783 Change-Id: I65bb9f6d1f70f921717acdf1dd24ab1d6e936e80 (cherry picked from commit 83594b82e0a9917d9be3f8cc54c2aa14d0f6bc57)
jira: STUDIO-12783 Change-Id: I65bb9f6d1f70f921717acdf1dd24ab1d6e936e80 (cherry picked from commit 83594b82e0a9917d9be3f8cc54c2aa14d0f6bc57)