jira: [STUDIO-11230][STUDIO-11260][STUDIO-11259] Change-Id: I6fdbeebf2a491f354c122eb35e5858bd6e72591c (cherry picked from commit f3992d3e9420e0bd4987c6ca4cfe96f9f35bdcd1)
jira: [STUDIO-11230][STUDIO-11260][STUDIO-11259] Change-Id: I6fdbeebf2a491f354c122eb35e5858bd6e72591c (cherry picked from commit f3992d3e9420e0bd4987c6ca4cfe96f9f35bdcd1)