jira: [STUDIO-11777] Change-Id: I733fd3532caa19546763ab8a72eb7667d5ffec53 (cherry picked from commit aa52c99076a78e2c8fd8d4e4b0b64de0bc761469)
jira: [STUDIO-11777] Change-Id: I733fd3532caa19546763ab8a72eb7667d5ffec53 (cherry picked from commit aa52c99076a78e2c8fd8d4e4b0b64de0bc761469)