jira: STUDIO-10927 Change-Id: I46b2c63a625f91d0caafa78cf47bf0fc8589015b (cherry picked from commit 9e2bfb7d7e56d886a85c0ee8c0e90dbc6ccfa932)
jira: STUDIO-10927 Change-Id: I46b2c63a625f91d0caafa78cf47bf0fc8589015b (cherry picked from commit 9e2bfb7d7e56d886a85c0ee8c0e90dbc6ccfa932)