jira: STUDIO-9907 Change-Id: Ie04fc4e1224e84810acde347b8ae9e73530f9031 (cherry picked from commit 915bae32d1d9023a0314361d1b257509fc676c7b)
jira: STUDIO-9907 Change-Id: Ie04fc4e1224e84810acde347b8ae9e73530f9031 (cherry picked from commit 915bae32d1d9023a0314361d1b257509fc676c7b)