jira: [STUDIO-11667] Change-Id: I9bc22e24138431cb3d94feacd64396208463da2e (cherry picked from commit 9da39db1d6a850328f668c7601521f3323c46a07)
jira: [STUDIO-11667] Change-Id: I9bc22e24138431cb3d94feacd64396208463da2e (cherry picked from commit 9da39db1d6a850328f668c7601521f3323c46a07)