Minor issues
Merge branch 'feature/xtags-review' into feature/angular-xtags