Merge branch '2888_cleanup'