jira: [STUDIO-12346] Change-Id: If83835fea7108babd2b19c26394ad0429493f394 (cherry picked from commit 85b07c170cd0e30f75dfab8ef68b02b0468c9f92)
jira: [STUDIO-12346] Change-Id: If83835fea7108babd2b19c26394ad0429493f394 (cherry picked from commit 85b07c170cd0e30f75dfab8ef68b02b0468c9f92)