merge of the actual 2.x into the 3.0