jira: [STUDIO-14589] Change-Id: I40f71ffe0ec65d7ebb945a06753b03c93135fa55 (cherry picked from commit c2d2bdc9349692a12b7cb0198864b6f6c7e88205)
jira: [STUDIO-14589] Change-Id: I40f71ffe0ec65d7ebb945a06753b03c93135fa55 (cherry picked from commit c2d2bdc9349692a12b7cb0198864b6f6c7e88205)