jira: STUDIO-11612 Change-Id: I947a16d3d95b009040a0ea26157e1c8004e36cc4 (cherry picked from commit 8ecc6aa224c1d44a804ecb0711162f56623037ca)
jira: STUDIO-11612 Change-Id: I947a16d3d95b009040a0ea26157e1c8004e36cc4 (cherry picked from commit 8ecc6aa224c1d44a804ecb0711162f56623037ca)