Changes for the build against 2.11.0-RC4