jira: [STUDIO-11133] Change-Id: I21280d9f9e9f3d7cc8811b5b3cf46ef4c09c61a9 (cherry picked from commit 18728451d02c16d6f64a9ebee50011b734bdb90b)
jira: [STUDIO-11133] Change-Id: I21280d9f9e9f3d7cc8811b5b3cf46ef4c09c61a9 (cherry picked from commit 18728451d02c16d6f64a9ebee50011b734bdb90b)