COR-334: Re-add the todos related to dates