After merge fixes

parent 47951d0a
Pipeline #7431 failed with stages
in 14 minutes and 7 seconds