JIRA: [STUDIO-12604] Change-Id: Id4c806594eea270decd2e4e3e4941f2bca932712 (cherry picked from commit 8d8391e7465b3d6843613e30bf7f68099ceecfd2)
JIRA: [STUDIO-12604] Change-Id: Id4c806594eea270decd2e4e3e4941f2bca932712 (cherry picked from commit 8d8391e7465b3d6843613e30bf7f68099ceecfd2)