jira: [STUDIO-9746] [STUDIO-9359] Change-Id: I12ce46c935883e5dba709576b944275af547d3dd (cherry picked from commit 80b5e4f4d637d1daaebdc784ef2d8eb5a8e25193)
jira: [STUDIO-9746] [STUDIO-9359] Change-Id: I12ce46c935883e5dba709576b944275af547d3dd (cherry picked from commit 80b5e4f4d637d1daaebdc784ef2d8eb5a8e25193)