Various modernizations

parent d5fcfb65
Pipeline #566 failed with stages
in 5 minutes and 58 seconds