Merge branch 'constrain-dates' into pu