jira:[STUDIO-9353] Change-Id: I1e1c23df196c43ae702078dce20f4fc86a02d047 (cherry picked from commit 881de812d8ddfcd33d67c68dcd26f8e81cfca5a4)
jira:[STUDIO-9353] Change-Id: I1e1c23df196c43ae702078dce20f4fc86a02d047 (cherry picked from commit 881de812d8ddfcd33d67c68dcd26f8e81cfca5a4)