Fix exception that was occurring with Date Field Tyep
Merge remote-tracking branch 'origin/release-1.1.1' into develop