Roll to 3.0c-SNAPSHOT