5.2 merge

Final merge of the 5.2 branch.