Rollup to main repo

Cleanups and small updates for 1.6.2 readiness.