Merge branch 'rw/apply-does-not-take-ignore-date' into maint