jira: [STUDIO-14210] Change-Id: Icd9eb8ebd88168aeca14bdaf12000e1ad78f95a4 (cherry picked from commit 301131f8560a29b2510ea57cea7d5df67f2cee3a)