Add changes from 3.0.6-2, 3.0.6-3 and several unreleased changes