jira: STUDIO-11059 Change-Id: Ief3e45f4e6cc079c60161b9b9a55b2152013b70e (cherry picked from commit ab26fb71a50c930c4c3945f91d275dbe78ea8c5c)
jira: STUDIO-11059 Change-Id: Ief3e45f4e6cc079c60161b9b9a55b2152013b70e (cherry picked from commit ab26fb71a50c930c4c3945f91d275dbe78ea8c5c)