Minor maintenance changes

Open Gandalf requested to merge g-maintenance into master

Merge request reports