jira: STUDIO-12322 Change-Id: I3040026acbb3fc5525cbda8eefae1b013b065a25 (cherry picked from commit 3e2e115e0e6727b33dcf0d47c597cdb18ab7ef50)
jira: STUDIO-12322 Change-Id: I3040026acbb3fc5525cbda8eefae1b013b065a25 (cherry picked from commit 3e2e115e0e6727b33dcf0d47c597cdb18ab7ef50)