jira: [STUDIO-10643] Change-Id: I6bd94f2e608b833e880033fdace236d465b9db38 (cherry picked from commit 99045ae070bb03641d1086993cc4ffaf51408730)
jira: [STUDIO-10643] Change-Id: I6bd94f2e608b833e880033fdace236d465b9db38 (cherry picked from commit 99045ae070bb03641d1086993cc4ffaf51408730)