jira: [STUDIO-10757] Change-Id: If4ebe6f93430f108ffde91448913a2e639ced3c8 (cherry picked from commit 27bb14eb226c8b9920d37b9940cb3d2ef6ec6f2d)
jira: [STUDIO-10757] Change-Id: If4ebe6f93430f108ffde91448913a2e639ced3c8 (cherry picked from commit 27bb14eb226c8b9920d37b9940cb3d2ef6ec6f2d)