Refs #8571 modifications for WISH
Refs #8571 wrong changes in merge
refs #8571. Fix merge conflict.