Set to 4.8.0-SNAPSHOT
Merge branch 'develop' into my-develop