Merge with dwrose date fixes