Merge "[AAI] Attempting to fix a compile run version mismatch in sparky"