jira: [STUDIO-13296] Change-Id: If5805345b0429504eba551a3115d8fcedd199c6d (cherry picked from commit c586f91e63e46ab8910bb7aca1537ba4cf47396a)
jira: [STUDIO-13296] Change-Id: If5805345b0429504eba551a3115d8fcedd199c6d (cherry picked from commit c586f91e63e46ab8910bb7aca1537ba4cf47396a)