jira: STUDIO-14288 Change-Id: I20f6a28ec9f017ac562d7684d232e0d109f628ca (cherry picked from commit f4213a6672d4be2386708e1f90068cbf039733d0) (cherry picked from commit 2a9e23a4ae7ca4ced3dee33f6714ce477a48292a)
jira: STUDIO-14288 Change-Id: I20f6a28ec9f017ac562d7684d232e0d109f628ca (cherry picked from commit f4213a6672d4be2386708e1f90068cbf039733d0) (cherry picked from commit 2a9e23a4ae7ca4ced3dee33f6714ce477a48292a)