jira: [STUDIO-9531] Change-Id: I827577b00e7245fe4d11d34c5736c57c815ffe5f (cherry picked from commit 8aa7c070d3f1d7e1c1b24805278d9faec9a93da2)
jira: [STUDIO-9531] Change-Id: I827577b00e7245fe4d11d34c5736c57c815ffe5f (cherry picked from commit 8aa7c070d3f1d7e1c1b24805278d9faec9a93da2)