jira: [STUDIO-11412] Change-Id: I999d5f4df34c7b1979a340735abaf275f2574674 (cherry picked from commit 63e6890cc742a861c53a109ba848b69292a1a858)
jira: [STUDIO-11412] Change-Id: I999d5f4df34c7b1979a340735abaf275f2574674 (cherry picked from commit 63e6890cc742a861c53a109ba848b69292a1a858)