Merge tag '3.7.0' into develop

3.7.0
Preparation for new development cycle after release 3.7.0
Version bump 3.8.0-dev.2
Version bump 3.7.1-rc.1
When updating a category a warning is can be shown.
Version bump 3.7.1
Merge branch 'release/3.7.1'