case 1712 - Disabled field requirement.
Merge branch 'case-1712' into develop