case 1712 - Disabled field requirement.
Merge remote-tracking branch 'origin' into release