jira: STUDIO-10927 Change-Id: I46b2c63a625f91d0caafa78cf47bf0fc8589015b (cherry picked from commit 9e2bfb7d7e56d886a85c0ee8c0e90dbc6ccfa932)
jira: none Change-Id: I8bc5d4a1eea116305037b8194ff1d2e8aab83ce9 (cherry picked from commit 7df9f9d27d174b30a54ed27756d4a4a157557019) (cherry picked from commit b97d44dae4854c342b835d3fd5265a22aec5d174)