Jira: STUDIO-4316 Change-Id: I576e35861cd6306b67a0b5bd098eb2a739faf75b (cherry picked from commit 59f80dad826ac81cf66a22a7e35fee87d94f0287)
Jira: STUDIO-4316 Change-Id: I576e35861cd6306b67a0b5bd098eb2a739faf75b (cherry picked from commit 59f80dad826ac81cf66a22a7e35fee87d94f0287)