Merge branch '3693_cleanup'