jira: STUDIO-10331 Change-Id: I4d42ed089e515c2d74dfade1589f20f1c80ca4ca (cherry picked from commit ce963cede53a72a123f55666a1f718726eb18ab6)
jira: STUDIO-10331 Change-Id: I4d42ed089e515c2d74dfade1589f20f1c80ca4ca (cherry picked from commit ce963cede53a72a123f55666a1f718726eb18ab6)