jira: STUDIO-10830 Change-Id: I12860206659f7f5e7e9c56b5b6448b9ab903fb7b (cherry picked from commit dd0893c5f83be46b962f28cf63c9c9a4d3df4ac9)
jira: STUDIO-10830 Change-Id: I12860206659f7f5e7e9c56b5b6448b9ab903fb7b (cherry picked from commit dd0893c5f83be46b962f28cf63c9c9a4d3df4ac9)