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