Merge branch 'jc/prune-all'