A fork of helix with a bespoke collection patches.

Merge remote-tracking branch 'origin/master' into debug master