Resolved the conflict during rebase. Refs #8291.
Merge remote branch 'origin/feature/8291_redo_checkwsmatch_detailinfo'