jira: [STUDIO-9241] Change-Id: I9a309594814e0547f7a6ef247ad710636f478b79 (cherry picked from commit 99ec1acc276800b8fcfe933fb224156a7890a7a6)
jira: [STUDIO-9241] Change-Id: I9a309594814e0547f7a6ef247ad710636f478b79 (cherry picked from commit 99ec1acc276800b8fcfe933fb224156a7890a7a6)