Merge "Use accessors for @hidden fields."