jira: STUDIO-10344 Change-Id: Ie71f83b7c78b4784e1824c52e61485e8f4d36e1e (cherry picked from commit 964a6c8320928278251e857283810dfd7a309618)