HV-755 

Aligning w/ BV API CR2. Quite a few issues touched in this pull request

* HV-755
* HV-757
* HV-759
* HV-761