fixed user cache issue, other minor enhancements
Merge remote-tracking branch 'origin/master'