#70 Cleanup validatedFieldName
Merge remote-tracking branch 'origin/htlwrn' into htlwrn