changes resulting from proposal 3154 (Rohringer)

These are the cumulative changes from said proposal. I left out the changes to load the tunnel XGM, as it was commented out later anyways, and probably should be done different anyways.

See merge request !224