after-release merge of the 2.x into the 3.0