Configuration update for 4.0.0-m2