jira: [STUDIO-10784] Change-Id: I508435efa74a0678ecf5e99f69813b2265bfb32c (cherry picked from commit 5e93d4c16c1b1dc6333408713bfabda8fe1b9d53)
jira: [STUDIO-10784] Change-Id: I508435efa74a0678ecf5e99f69813b2265bfb32c (cherry picked from commit 5e93d4c16c1b1dc6333408713bfabda8fe1b9d53)