jira: [STUDIO-10813] Change-Id: I0304908f7819be1482744e253332bfca1044732e (cherry picked from commit 3bd7bee74308566e15ae5f9ec4070386b38cc8c1)
jira: [STUDIO-10813] Change-Id: I0304908f7819be1482744e253332bfca1044732e (cherry picked from commit 3bd7bee74308566e15ae5f9ec4070386b38cc8c1)