Addition to maintenance
Merge pull request #5806 from PerJensen/aalborg_maintenance

Addition to maintenance PR #5783