jira: [STUDIO-9850] Change-Id: I5dfd8b7711ec3db96b7fba75a9a97bd4852db63c (cherry picked from commit 6be2379a044e51e9a18075944e24459d6d0311b7)
jira: [STUDIO-9850] Change-Id: I5dfd8b7711ec3db96b7fba75a9a97bd4852db63c (cherry picked from commit 6be2379a044e51e9a18075944e24459d6d0311b7)