Include @brendo's issue-2003 branch
System date filters

Fixes #2003