Merge branch 'np/no-loosen-prune-expire-now'