Restored overwritten changes
Code cleaning up for user data access
Fixed typos
Merge branch 'develop' into user
Restore overwriten changes