Final fixes for 2018

Merge request reports

Loading