Merge "Handle bundle-vars directly in dist-compare script"