Merge "ART: Fix old run scripts"