jira: STUDIO-12826 Change-Id: I3ab585aa899dee5cf006effb3cea15b5e64332eb (cherry picked from commit 56e239e38103a0f1631f0174c9153e239ab5c802)
jira: STUDIO-12826 Change-Id: I3ab585aa899dee5cf006effb3cea15b5e64332eb (cherry picked from commit 56e239e38103a0f1631f0174c9153e239ab5c802)