jira: STUDIO-10735 Change-Id: I919db3f1767bfde72d66bdc06b2d77ba8f878cac (cherry picked from commit 19e3ceab844de1d2fa8ec0cd007267a68d3c0954)
jira: STUDIO-10735 Change-Id: I919db3f1767bfde72d66bdc06b2d77ba8f878cac (cherry picked from commit 19e3ceab844de1d2fa8ec0cd007267a68d3c0954)