Merge branch 'feature/ruler' into develop