adding disabled user changes to develop branch
Merge pull request #1925 from reciprocity/feature/disable-user-to-develop

adding disabled user changes to develop branch