merge of the actual master into 3.x branch