jira: [STUDIO-10847] Change-Id: I3cb11f4f584c5f6bc42c8ae9a1464190f33c1774 (cherry picked from commit 8079244d15a5eabe4d58cda1af01c93e05b2f7ac)
jira: [STUDIO-10847] Change-Id: I3cb11f4f584c5f6bc42c8ae9a1464190f33c1774 (cherry picked from commit 8079244d15a5eabe4d58cda1af01c93e05b2f7ac)