Hopefully, bump to 5.0
Merge branch 'public' into develop
Bump dev version to 6.0 alpha