Merge branch 'cleanups-4.6' into for-chris-4.6