jira:[STUDIO-12217] Change-Id: I69f55f129408039952524753a67b15869f670214 (cherry picked from commit d3ac9a4b9d746c7a1193fd3aef09da13f61c40d2)
jira:[STUDIO-12217] Change-Id: I69f55f129408039952524753a67b15869f670214 (cherry picked from commit d3ac9a4b9d746c7a1193fd3aef09da13f61c40d2)