jira: STUDIO-12996 Change-Id: Ib03dc506bfdc8f7f2c0a8cff89ba6e2d4b784988 (cherry picked from commit b8e1be7b3cb9d2948fd2fe45c280b1ec3bcea525)
jira: STUDIO-12996 Change-Id: Ib03dc506bfdc8f7f2c0a8cff89ba6e2d4b784988 (cherry picked from commit b8e1be7b3cb9d2948fd2fe45c280b1ec3bcea525)