jira: STUDIO-9647 Change-Id: I66e4838c6462e7ca8a5dd6228df54ab98987e6f8 (cherry picked from commit 56651d75d1180c1e222a0b70c4931eff40245f08)
jira: STUDIO-9647 Change-Id: I66e4838c6462e7ca8a5dd6228df54ab98987e6f8 (cherry picked from commit 56651d75d1180c1e222a0b70c4931eff40245f08)