Jira: [STUDIO-12520] Change-Id: I34c88b6a84514a0e56e65723f91d1a2940128e8d (cherry picked from commit b8879ec648e038080628190fc363251229bbd5ee)
Jira: [STUDIO-12520] Change-Id: I34c88b6a84514a0e56e65723f91d1a2940128e8d (cherry picked from commit b8879ec648e038080628190fc363251229bbd5ee)