jira: STUDIO-11117 Change-Id: Icf155f04eb0e1fcc995d04c6f4646a6d729cb1cb (cherry picked from commit d22a2e91e53c76bc40fdacc1ee5c7faff216711d)
jira: STUDIO-11117 Change-Id: Icf155f04eb0e1fcc995d04c6f4646a6d729cb1cb (cherry picked from commit d22a2e91e53c76bc40fdacc1ee5c7faff216711d)