jira: STUDIO-12228 Change-Id: Ic1ca62e68fb13c7cbf8ee35f948b05b01e010a62 (cherry picked from commit 63ba575f0e8881866d47c99bd521087210c57230)
jira: STUDIO-12228 Change-Id: Ic1ca62e68fb13c7cbf8ee35f948b05b01e010a62 (cherry picked from commit 63ba575f0e8881866d47c99bd521087210c57230)