jira: STUDIO-10016 Change-Id: I000fa5719cf631ff0c63b6379850e1915f78ddaa (cherry picked from commit 170687352efa3e87605a2bc37eafbed3679417f9)
jira: STUDIO-10016 Change-Id: I000fa5719cf631ff0c63b6379850e1915f78ddaa (cherry picked from commit 170687352efa3e87605a2bc37eafbed3679417f9)