merge of the current 2.x into the 3.0