Move to version 4.0.0, added relevant upgrtade step