jira: [STUDIO-9580] [STUDIO-10092] Change-Id: I133d23bef894d3784fa0e12c1d27a8a93448ebfa (cherry picked from commit ea36ee5879b4b05b4d7ac98094697ce6e9eb1ba8)
jira: [STUDIO-9580] [STUDIO-10092] Change-Id: I133d23bef894d3784fa0e12c1d27a8a93448ebfa (cherry picked from commit ea36ee5879b4b05b4d7ac98094697ce6e9eb1ba8)