Fixed merge issues between our branch and latest HE master.