jira: STUDIO-9620 Change-Id: Iaa1af887e646a136e657ccecabe3c8e6824131b3 (cherry picked from commit b028f971d663dcafd63b0ce92cc9b606b7c9cf37)
jira: STUDIO-9620 Change-Id: Iaa1af887e646a136e657ccecabe3c8e6824131b3 (cherry picked from commit b028f971d663dcafd63b0ce92cc9b606b7c9cf37)