case 1712 - Disabled field requirement. Sanity check for ws link.
Merge branch 'case-1712' into develop