Merge branch 'jc/date'