Merge branch '3641_cleanup'