jira: [STUDIO-11821] Change-Id: If94cd6d332fa908dda3c950940586e4bb8cef2ec (cherry picked from commit 32f02721cabf4ff7c7789e6d5472a36083114c3c)
jira: [STUDIO-11821] Change-Id: If94cd6d332fa908dda3c950940586e4bb8cef2ec (cherry picked from commit 32f02721cabf4ff7c7789e6d5472a36083114c3c)