Change36 leakfixes master

This is the master-version of #1752, with one conflict fixed on the rebase.
Note that the whole 3.6 section's heading still says "Release Candidate" rather than final release.