Dodger/HFX-955 : Multiple commits