Feature/200 extra dates rebase

Cherry-picked the commits of an earlier PR for ticket 200.