Combine rev

This needs the public api server to be updated before this can be built