Delete fresh when
Merge branch 'hotfix/fresh_when'