jira: [STUDIO-12864] Change-Id: I1aec11cea9d82c37a9284f4d3abb849f228a16bf (cherry picked from commit 27c2d03424314fa10950f89e737827f3c6bb1637)
jira: [STUDIO-12864] Change-Id: I1aec11cea9d82c37a9284f4d3abb849f228a16bf (cherry picked from commit 27c2d03424314fa10950f89e737827f3c6bb1637)