3.0-dev update 2.1