Resolve HPR-150

Reinier van der Wallerequested to merge
HPR-150 into master

Closes HPR-150. Note that the testbench needs RTSD-165 to run.

Merge request reports