3.0-dev update 4.1