Re #7990 add help doc
Re #7990 catch more error conditions
Merge remote-tracking branch 'origin/feature/7990_SANS_Stitch_Doc'