merge 3.0.0 -- test preparations done