Merging all rendering and annotation changes.