Merge branch 'feature/measure' into develop