Changes up to 2.3.7 merged into unstable branch.