Merge "ART: API changes"