jira:[STUDIO-9692] Change-Id: I76be87fe219ddd79cae27a7cf5c05315efb0b331 (cherry picked from commit 8f2ab037fd97ead60f8d941c90230306e9227d95)
jira:[STUDIO-9692] Change-Id: I76be87fe219ddd79cae27a7cf5c05315efb0b331 (cherry picked from commit 8f2ab037fd97ead60f8d941c90230306e9227d95)