jira: [STUDIO-9648] Change-Id: I027bf7f72b77c35422b2d904f3b0839dcbe3669e (cherry picked from commit 27d5ca4ac6a8eb8aa938d4537bb2902c21a9cd82)
jira: [STUDIO-9648] Change-Id: I027bf7f72b77c35422b2d904f3b0839dcbe3669e (cherry picked from commit 27d5ca4ac6a8eb8aa938d4537bb2902c21a9cd82)