Merge "Adopting refactoring from 145321" into studio-1.3-dev
automerge: 9f667c6

* commit '9f667c6ea054f7991fcd4e8a3ea884318b4dbaa2':
  Adopting refactoring from 145321