Merge branch 'jlouis/date-manipulations' into next