Rollup of recent changes.