Moved to parent 3.5.0-SNAPSHOT