jira: [STUDIO-9715] Change-Id: I376235de8a8569e63530eca914dc977a670a769c (cherry picked from commit 4f1ad8016e11d5440127b45c48854c1ed2cf75aa)
jira: [STUDIO-9715] Change-Id: I376235de8a8569e63530eca914dc977a670a769c (cherry picked from commit 4f1ad8016e11d5440127b45c48854c1ed2cf75aa)