Merge "ART: Add to comments" into pi-dev