jira: STUDIO-12250 Change-Id: Id0c75523037a560713d75a017aebe58aabe3309a (cherry picked from commit 9bd091bee2388f60cbba41a88571a3de7df23214)
jira: STUDIO-12250 Change-Id: Id0c75523037a560713d75a017aebe58aabe3309a (cherry picked from commit 9bd091bee2388f60cbba41a88571a3de7df23214)