Refs #6670 code, test, and wiki