jira: [STUDIO-9967] Change-Id: Ie0b96d6a12e5d5b526e92360f7e93087134ed0a9 (cherry picked from commit 716f22046db7de19ad298e6babed4398512bf7e7)
jira: [STUDIO-9967] Change-Id: Ie0b96d6a12e5d5b526e92360f7e93087134ed0a9 (cherry picked from commit 716f22046db7de19ad298e6babed4398512bf7e7)