Merge branch 'feature/hererocks' into develop