Merge "ART: Forward-declare Context"