jira: STUDIO-10223 Change-Id: I93f805cfa7780e666b4e2f2430c4fcdfa3de0c8a (cherry picked from commit e288462439ddf34db0bf10b55970d07ded662ccb)