jira: [STUDIO-12153] Change-Id: I2397360439d5baaf673c9fc306f3b08eb068cfec (cherry picked from commit 8308fe3964f72cd911ac472923e8b27b0b3f9c61)
jira: [STUDIO-12153] Change-Id: I2397360439d5baaf673c9fc306f3b08eb068cfec (cherry picked from commit 8308fe3964f72cd911ac472923e8b27b0b3f9c61)