Some changes

parent d041e66a
Pipeline #2975 failed with stages