reformat & review
Merge branch 'develop' into feature/lucence-range-index