Made compatible with 2.11.0-RC1.