Merge in updates from es92/hexel