Add capability to override a label for a field defined by xpath.
Merge remote-tracking branch 'origin/develop' into develop