Merge branch '2845_cleanup'