Only load type if it hasn't already been loaded
Merge pull request #2558 from chrisnharvey/2.2/develop

Only load field type if it hasn't already been loaded