Merge branch 'indexedset' into bizo
Merge branch 'kryofix' into bizo