jira: [STUDIO-12923] Change-Id: I22bb0d8ebd13d23f46bd785d3a4848669185175d (cherry picked from commit 187040d70c9416f5f3ca9dbe74f1d1d09cb23218)
jira: [STUDIO-12923] Change-Id: I22bb0d8ebd13d23f46bd785d3a4848669185175d (cherry picked from commit 187040d70c9416f5f3ca9dbe74f1d1d09cb23218)