Updated to 5.0.0.M7-SNAPSHOT