jira: STUDIO-9956 Change-Id: Ibef1db35c2953040bb7df6b53ed3144f3ff85d96 (cherry picked from commit 99837d8c01e782ef6634ab60a06e05f48ca31437)
jira: STUDIO-9956 Change-Id: Ibef1db35c2953040bb7df6b53ed3144f3ff85d96 (cherry picked from commit 99837d8c01e782ef6634ab60a06e05f48ca31437)