jira: [STUDIO-13728] Change-Id: Ie4419ecd809bd4392035ad063849f271e687b0f0 (cherry picked from commit 7aa1916fe8491ca1653acc55ee3ac527415b6113)
jira: [STUDIO-13728] Change-Id: Ie4419ecd809bd4392035ad063849f271e687b0f0 (cherry picked from commit 7aa1916fe8491ca1653acc55ee3ac527415b6113)