catch up branch that was included in incorrect fork.

Jason Goserequested to merge
issue/link_magician-3586085:3585537-link-field-support into 1.0.x

Merge request reports