jira: [STUDIO-11790] Change-Id: I4980616639ac74417a0243580236232f4baa938c (cherry picked from commit 4b7610d216570b0b0ec267eccbd6f8cb5f488fa7)
jira: [STUDIO-11790] Change-Id: I4980616639ac74417a0243580236232f4baa938c (cherry picked from commit 4b7610d216570b0b0ec267eccbd6f8cb5f488fa7)