jira: [STUDIO-9786] Change-Id: I935133161d3ecf09b72eb235bba335c5086e5674 (cherry picked from commit fed792d3794c28a2a80341e252e95d9db6a209ff)