Merge branch '3547_cleanup'