jira: [STUDIO-11370] Change-Id: I22bfc3c1805ac4ea9803cadaeec74a3787bec29f (cherry picked from commit d702c290e015d05733ed67cbedb5e8bcc01aa7b9)
jira: [STUDIO-11370] Change-Id: I22bfc3c1805ac4ea9803cadaeec74a3787bec29f (cherry picked from commit d702c290e015d05733ed67cbedb5e8bcc01aa7b9)