jira: [STUDIO-13529] Change-Id: I6a44da3b2774305db179cfed0781d67e9b5a7e2e (cherry picked from commit 0225c329c8eb8fee332d2cf9732b83ccd0c1dbb3)
jira: [STUDIO-13529] Change-Id: I6a44da3b2774305db179cfed0781d67e9b5a7e2e (cherry picked from commit 0225c329c8eb8fee332d2cf9732b83ccd0c1dbb3)