jira: [STUDIO-8558] Change-Id: I97c49f438571340f80fd6a003f31c57d233cafda (cherry picked from commit 2f271463c929c17b92c1850f3b72b6f7343c1ed3)
jira: [STUDIO-8558] Change-Id: I97c49f438571340f80fd6a003f31c57d233cafda (cherry picked from commit 2f271463c929c17b92c1850f3b72b6f7343c1ed3)