jira: [STUDIO-10923] Change-Id: I7069ed1ea0112837080c59895081e798d6a83e6e (cherry picked from commit c47759dd1fe17c840fa92ab3fec803a58d2d1785)
jira: [STUDIO-10923] Change-Id: I7069ed1ea0112837080c59895081e798d6a83e6e (cherry picked from commit c47759dd1fe17c840fa92ab3fec803a58d2d1785)