jira: [STUDIO-14427] Change-Id: I8b0c56ce1c2b7b90949b72c49acfdbb31c876df1 (cherry picked from commit 76e45bde2540ee418719e00b999c5fd724baec71)
jira: [STUDIO-14427] Change-Id: Ibfbbb849d9aa30dbc62ddf8aecffad6681d2c894 (cherry picked from commit dbad9dfd4adc0ea7553c9cda6d06959387762e7d)