jira: STUDIO-9028 Change-Id: Id1c6cc9005fc5073d885274e360d31282063a9a3 (cherry picked from commit e74c9e710b4bed97e637c8197052b5bd864bfc95)
jira: STUDIO-9028 Change-Id: Id1c6cc9005fc5073d885274e360d31282063a9a3 (cherry picked from commit e74c9e710b4bed97e637c8197052b5bd864bfc95)