jira:[STUDIO-10998] Change-Id: I1c1240f69c187c2d0de4887e51596fba8db68744 (cherry picked from commit 0a9e1c8899bb3bd1c5a7063d0fabf07572c4ee04)
jira:[STUDIO-10998] Change-Id: I1c1240f69c187c2d0de4887e51596fba8db68744 (cherry picked from commit 0a9e1c8899bb3bd1c5a7063d0fabf07572c4ee04)