Allow retention by weeks, not just months.
Fixing merge conflict.