Jira: STUDIO-13310 Change-Id: I316f4508d11288e287a6f8738a3c8fe9f45fada9 (cherry picked from commit 9f1887791543f0de139221887ce45c65e8a111fc)
Jira: STUDIO-13310 Change-Id: I316f4508d11288e287a6f8738a3c8fe9f45fada9 (cherry picked from commit 9f1887791543f0de139221887ce45c65e8a111fc)