jira: STUDIO-8657 Change-Id: I0fdfac500716d83f45c73dc07feab032e793e7a5 (cherry picked from commit 695b3c78e4b283df1ac5e5f63e73b0cbbc6196a2)
jira: STUDIO-8657 Change-Id: I0fdfac500716d83f45c73dc07feab032e793e7a5 (cherry picked from commit 695b3c78e4b283df1ac5e5f63e73b0cbbc6196a2)