jira: STUDIO-14933 Change-Id: Ib9cf365eca55374ed66e5c51b871542a2004f39f (cherry picked from commit e167a492a1e784311f118b28acf8b3255d10936f)
jira: STUDIO-14933 Change-Id: Ib9cf365eca55374ed66e5c51b871542a2004f39f (cherry picked from commit e167a492a1e784311f118b28acf8b3255d10936f)