Merge branch 'dev-angular' into feature/ng-toolbar-sort-by