Prework 2.0

Some minor things which needed to be done before 2.0

Merge request reports

Loading