Merge pull request #371 from vwadekar/retention-entry-v3

Retention entry v3