jira: STUDIO-9422 Change-Id: If81e1ac9379ccbc4b40cbda5cf8cb876ea230173 (cherry picked from commit 758d37d0807288cf63fa2b7487a65d7097b94e8e)
jira: STUDIO-9422 Change-Id: If81e1ac9379ccbc4b40cbda5cf8cb876ea230173 (cherry picked from commit 758d37d0807288cf63fa2b7487a65d7097b94e8e)