Merge branch '2944_cleanup'