jira: [STUDIO-11664] Change-Id: I3c2c23cb9f8db0b3fec848616bb1d434759fa1d8 (cherry picked from commit ff62a7fe61be7f47168af094232476a7d8712229)
jira: [STUDIO-11664] Change-Id: I3c2c23cb9f8db0b3fec848616bb1d434759fa1d8 (cherry picked from commit ff62a7fe61be7f47168af094232476a7d8712229)