HEL-1: Merge back into dfeldman repo