merge of the actual 3.0 into the 3.1