#414 Remaining changes from MR

#414 Add leftovers that were not pushed

Merge request reports

Loading