Port to 2.11.0-SNAPSHOT