Rollup of recent changes