jira: [STUDIO-9566] Change-Id: I781ee149a2b184ee8d559dbb494798386e67e059 (cherry picked from commit 77dc987ad58534b033b025b9d47bb806718667c3)
jira: [STUDIO-9566] Change-Id: I781ee149a2b184ee8d559dbb494798386e67e059 (cherry picked from commit 77dc987ad58534b033b025b9d47bb806718667c3)