Flask changes

Marit Lebakkenrequested to merge
marit into main

This reverts commit fd02c574

Merge request reports