bugfix prune error
Merge branch 'master' into develop