jira: [STUDIO-10617] Change-Id: I3e924640ccfca2fa1a7ff70d54f7b48759ee1ac7 (cherry picked from commit 4fc69c70d4b1d3cf75b40ca09c660731ba2af85c)
jira: [STUDIO-10617] Change-Id: I3e924640ccfca2fa1a7ff70d54f7b48759ee1ac7 (cherry picked from commit 4fc69c70d4b1d3cf75b40ca09c660731ba2af85c)