jira: [STUDIO-11094] Change-Id: I1ef4bcaef406616d898f198cdf803213d47c5f68 (cherry picked from commit fd795f19163a1e310753ce6834672ce3b504d3c2)
jira: [STUDIO-11094] Change-Id: I1ef4bcaef406616d898f198cdf803213d47c5f68 (cherry picked from commit fd795f19163a1e310753ce6834672ce3b504d3c2)