Compacted commit for open source release.