Rolled up build of recent changes.