Merge branch '2740_cleanup'