jira: [STUDIO-12442] Change-Id: I51e43692c692c910e94d4e67349a70377b057d1c (cherry picked from commit 5c4c3c7f953a980aebfaed5120a65e81ba79b56f)
jira: [STUDIO-12442] Change-Id: I51e43692c692c910e94d4e67349a70377b057d1c (cherry picked from commit 5c4c3c7f953a980aebfaed5120a65e81ba79b56f)