Only clear bug fixes are wanted at this point to make the next release candidate(s) as small as possible. In this case, the PR contained some cleanups. More ch

Only clear bug fixes are wanted at this point to make the next release candidate(s) as small as possible. In this case, the PR contained some cleanups. More changes can mean more regressions. The goal is to stabilize the master branch so that v4.13 can be released.