Jira: [STUDIO-14633] Change-Id: Ic88bc5ec6f49e644304f8db374a930d663825819 (cherry picked from commit 8bd642de670fa709dcd3ec0e852599e596da4cb4)
Jira: [STUDIO-14633] Change-Id: Ic88bc5ec6f49e644304f8db374a930d663825819 (cherry picked from commit 8bd642de670fa709dcd3ec0e852599e596da4cb4)