Merge pull request #1971 from anilgooru/dev-branch

Dev branch
Updated missing ui:field name.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: