jira: STUDIO-10017 Change-Id: I62f955c47fbf7c59782ec8a7a7e316ef020942a5 (cherry picked from commit 66b5ef0d86f0212b4843cabed9fe408127a219cf)
jira: STUDIO-10017 Change-Id: I62f955c47fbf7c59782ec8a7a7e316ef020942a5 (cherry picked from commit 66b5ef0d86f0212b4843cabed9fe408127a219cf)