Yes, that's my thinking as well. We need to validate the cert PR and I will hold off on the toolchain changes.