EHO-206 help text added
EHO-206 help text added
merge conflict
fixed bad merge