Up-to-date with master.
Infrastructure for hole mechanism.