JIRA: [STUDIO-11919] Change-Id: I43f39dbd87514fea5ad8f43dbadb142cec1cfd46 (cherry picked from commit 9bc62966fbb2a931cafe16290b17f087cf1450d6)
jira: [none] Change-Id: I4f13b1c3980316240c5dde349c25afd20bf3c2b2 (cherry picked from commit d791999b9bb259dda728126272ef0bae37645822)