[3.0] merge of the actual 2.x into 3.0