Release 3.7

Final merge of Release 3.7