jira: [STUDIO-9412] Change-Id: Ia19a05477d4b52b65afdbbab7b6f841caa15089c (cherry picked from commit 067966e7046b642ff98512d16d49329c1f277a58)
jira: [STUDIO-9412] Change-Id: Ia19a05477d4b52b65afdbbab7b6f841caa15089c (cherry picked from commit 067966e7046b642ff98512d16d49329c1f277a58)