Add defaults for 2017 and 2018 DataType, remove MC09 and DC06

Merge request reports

Loading