Merge branch 'develop' into feature/return-total-for-reports