Various maintenance tasks

Gandalfrequested to merge
g-maintenance into develop

Merge request reports