Merge "ART: Follow-up fixes"