JIRA: STUDIO-7378 Change-Id: I95fee50db29825e508d276d52c7a3e85e1347ebd (cherry picked from commit 13db95ceb4f18b8cbce1e67447eeaa6ee36cc8ad)
JIRA: STUDIO-7378 Change-Id: I95fee50db29825e508d276d52c7a3e85e1347ebd (cherry picked from commit 13db95ceb4f18b8cbce1e67447eeaa6ee36cc8ad)