Reverted version to 3.5.0-M3-SNAPSHOT