Merge branch 'hotfix-4.2.1'
remove stuff that became obsolete
removed unnecessary reference
Merge branch 'release-5.0'
Merge tag '5.0.0' into develop