Dodger/HFX-999: Multiple commits