Shift rule for version name
Merge branch 'develop' into feature/reports