This commit also corrects CS's description in Doxygen. refs #4318 Change-Id: Ie8854a2e2b59a072b98603c0cc31768bb84ea6d2