Merge "ART: Add miranda checking"