Merge branch 'feature/refactor-visualizations' into develop