Merge branch 'feature/visualisations' into feature/angular