Merge in performance changes from es92/hexel:master