Merge branch 'jc/prune-all' into next