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