Minor maintenance updates

Closed Kaspar Vollenweider requested to merge minor-maintenance-updates into main

Merge request reports