Merge "ART: Add support for generic field signature"