jira: [STUDIO-10692] Change-Id: I85e8da120946fc6ff845c9b88d4f1594e313652b (cherry picked from commit 7115c1ca177e98c2931517d748ce4d63d3a067da)
jira: [STUDIO-10692] Change-Id: I85e8da120946fc6ff845c9b88d4f1594e313652b (cherry picked from commit 7115c1ca177e98c2931517d748ce4d63d3a067da)