Fix issue with NullFlagList being removed from library

48 jobs for !1178 with docker/reenable-dockerhub in 220 minutes and 7 seconds (queued for 10 seconds)
merge request