Merge branch 'rs/pickaxe' into next