jira: STUDIO-12878 Change-Id: I4f1b465e95501bf9e35619902f0403b44bbb9152 (cherry picked from commit 3c33add1dbb308ee4250e6638c239b4a1d6d7d12)
jira: STUDIO-12878 Change-Id: I4f1b465e95501bf9e35619902f0403b44bbb9152 (cherry picked from commit 3c33add1dbb308ee4250e6638c239b4a1d6d7d12)