Merge pull request #1909 from ssushma/dev-branch

reverted widget changes