Merge branch 'rs/pickaxe-simplify'