Merge branch '3607_cleanup'