am 5747266d: Merge "Clean up hash set"

* commit '5747266d57445ecdd026a4705d62768faad09b01':
  Clean up hash set