jira: STUDIO-12173 Change-Id: Idc320704813f6e627d043d22e0f68d8b9de901a8 (cherry picked from commit e5f7678e8bf1c640b306530752e75e53bdae0f85) (cherry picked from commit 9eea94115a9b191e2617c9aed5e8b5b4cc2287be)
jira: STUDIO-12173 Change-Id: Idc320704813f6e627d043d22e0f68d8b9de901a8 (cherry picked from commit e5f7678e8bf1c640b306530752e75e53bdae0f85) (cherry picked from commit 9eea94115a9b191e2617c9aed5e8b5b4cc2287be)