jira: [STUDIO-9769] [STUDIO-9547] Change-Id: I29149a978b86c27b244690083e0c3bb96566e60b (cherry picked from commit 329807156a1d5aa60069beb3ae62527e8295bfc7)
jira: [STUDIO-9769] [STUDIO-9547] Change-Id: I29149a978b86c27b244690083e0c3bb96566e60b (cherry picked from commit 329807156a1d5aa60069beb3ae62527e8295bfc7)