fixed merge errors / user cache issue
Merge branch 'develop' into devpatch