Merge pull request #1826 from anilgooru/dev-branch

Fixed no ui field issue.
Added event for changing the button selected.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: