Merge branch 'angular-style-refactor'