Merge branch 'rc/constrain'
Merge branch 'rc/end-first'

This also allows constrain-date-by-end-date to work.