3.0 unstable

Merging 3.0 branch