jira: STUDIO-12116 Change-Id: I375e53a32e31488b0a0d07d388f7c7aa29624817 (cherry picked from commit 0c08ea3e2ecb5c819fc6c06dfedf01e733f84383)
jira: STUDIO-12116 Change-Id: I375e53a32e31488b0a0d07d388f7c7aa29624817 (cherry picked from commit 0c08ea3e2ecb5c819fc6c06dfedf01e733f84383)