jira: STUDIO-11031 Change-Id: I14c6daeb275a82d019f88246b23013163a14ded1 (cherry picked from commit aa7fbd4926254be62ccee40b0a7d23b90a109675)
jira: STUDIO-11031 Change-Id: I14c6daeb275a82d019f88246b23013163a14ded1 (cherry picked from commit aa7fbd4926254be62ccee40b0a7d23b90a109675)