Merging before 3.0b1 release