Squash merge the development-3.0 branch