jira: [STUDIO-9275] Change-Id: I8105828183d42496eed77793daa1c1a618e252bf (cherry picked from commit 478fc597c4b0f054c93bef954f3ca1054111b4b3)