(refs #7250) Merging master, minor CHR bugfixes