Merge branch '3420_cleanup'