[Bug 1874] Final commit.