jira: [STUDIO-11038] Change-Id: I7f439d947a4568f5f796f295a95209c3a4d0de68 (cherry picked from commit 7c0215454f7be1526e697f84d99977883247eda5)
jira: [STUDIO-11038] Change-Id: I7f439d947a4568f5f796f295a95209c3a4d0de68 (cherry picked from commit 7c0215454f7be1526e697f84d99977883247eda5)