jira: [STUDIO-12552] Change-Id: I68048c6fa358253664adbf8fe637c6c0c95e1eb9 (cherry picked from commit 65bb25d80435c28bdaa1fe4445f7fc790f5de22f)
jira: [STUDIO-12552] Change-Id: I68048c6fa358253664adbf8fe637c6c0c95e1eb9 (cherry picked from commit 65bb25d80435c28bdaa1fe4445f7fc790f5de22f)