Merge "Tweak the CUJ scripts to make it work in CI." into main