Move to rhine-common