Fixes for Jira: HD-10101

REV 3 of the docs for HD 2.0.1