jira: STUDIO-12546 Change-Id: Ibb674de256c306123c1ab7761945eda18704fe0e (cherry picked from commit d3174f35d81654a36a85194b94c2cec1ee263ded)
jira: STUDIO-12546 Change-Id: Ibb674de256c306123c1ab7761945eda18704fe0e (cherry picked from commit d3174f35d81654a36a85194b94c2cec1ee263ded)