jira: [STUDIO-11973] Change-Id: I17e927c4b5f061cd66ed0b6015f43358e673ef9b (cherry picked from commit 1bc83e42a77bb066610f6865c29481ee50dd1a23)
jira: [STUDIO-11973] Change-Id: I17e927c4b5f061cd66ed0b6015f43358e673ef9b (cherry picked from commit 1bc83e42a77bb066610f6865c29481ee50dd1a23)