Misc cleanups all over
Merge remote branch 'origin/7.x-4.x' into 7.x-4.x