jira: STUDIO-11056 Change-Id: I1c651421f8914a25707ad5b5c1d3e3d56c2df959 (cherry picked from commit 7af3eba50047c4b5f852f2ac3814243543a5019a)
jira: STUDIO-11056 Change-Id: I1c651421f8914a25707ad5b5c1d3e3d56c2df959 (cherry picked from commit 7af3eba50047c4b5f852f2ac3814243543a5019a)