Epic/2/date config

Mike Hoang requested to merge epic/2/date-config into master

Merge request reports