Changes after merging with 1.0-M4-SNAPSHOT