jira: [STUDIO-10308] Change-Id: I67c5bdb753abfe9fa233e427a7b518c2fad4fd01 (cherry picked from commit 0730c4ec51e859f5ba7474c64edfaac657dc69de)
jira: [STUDIO-10308] Change-Id: I67c5bdb753abfe9fa233e427a7b518c2fad4fd01 (cherry picked from commit 0730c4ec51e859f5ba7474c64edfaac657dc69de)