jira: [STUDIO-11883] Change-Id: Ib75383f4e75a0bcd566dcf555695f2a9f45f0cba (cherry picked from commit 6a12adb7f0b83c025ad09e7e59e68d07a0ea8335)
jira: [STUDIO-11883] Change-Id: Ib75383f4e75a0bcd566dcf555695f2a9f45f0cba (cherry picked from commit 6a12adb7f0b83c025ad09e7e59e68d07a0ea8335)