Merge branch '4524_cleanup'