Finished merge of 3.6.1