Merge branch 'master' into develop
case 1712 - Disabled field requirement. Sanity check for ws link.
Merge branch 'case-1712' into develop
Merge remote-tracking branch 'origin/develop'