5.0

To be created as new branch off 5.0.1.Final