Merge branch 'feature/angular' into feature/content