Merge branch '3955_cleanup'