enforce DS hash exists

Merged Mark Andrews requested to merge 899-enforce-hash-in-ds-v9_14 into v9_14 Apr 10, 2019