jira: [STUDIO-11526] Change-Id: Id68f43e1b6d1401c72966f97643d6631f23b87a9 (cherry picked from commit b2b4eabbfb7cb60cb1cb1b5e4fc624e52e956e22)
jira: [STUDIO-11526] Change-Id: Id68f43e1b6d1401c72966f97643d6631f23b87a9 (cherry picked from commit b2b4eabbfb7cb60cb1cb1b5e4fc624e52e956e22)