jira: [STUDIO-8650] [STUDIO-9220] [STUDIO-9392] Change-Id: Ib543b8043d517ce312e7489cbee72e93bf0d9757 (cherry picked from commit 77abf5ad6e57cf392b868d38e65610e4d0716977)
jira: [STUDIO-8650] [STUDIO-9220] [STUDIO-9392] Change-Id: Ib543b8043d517ce312e7489cbee72e93bf0d9757 (cherry picked from commit 77abf5ad6e57cf392b868d38e65610e4d0716977)