Merge branch 'jc/date' into next