Merge branch 'js/prune-expire'