jira: [STUDIO-9582] Change-Id: I5ad4083d666db4237d355ac8bd8160afb8e8a35f (cherry picked from commit 954a27016953bcf4f07b2a3e14ac1f5faf68c644)
jira: [STUDIO-9582] Change-Id: I5ad4083d666db4237d355ac8bd8160afb8e8a35f (cherry picked from commit 954a27016953bcf4f07b2a3e14ac1f5faf68c644)