cqi pushed to rpkg (f26). "Backport container-build fix"