Merge branch '2876_cleanup'