jira: [STUDIO-12075] Change-Id: Ia002bf1cd944b9a5e36f639eb80088327b446a60 (cherry picked from commit 0f31c70a832aeccbbfb6f712ef0a490951c3529c)