jira: [STUDIO-9942] Change-Id: I5b46fb530f08d0de4c8cf5a23707ec539d82356d (cherry picked from commit 8b237bf959d2718c0397530af599c3a24a650d74)