Merge pull request #590 from bhariharan/unstable

Adding true support for multi user scenarios in the managers and making it more robust
Fixing some synchronization issues
Already synchronized
Merge pull request #592 from bhariharan/master

Fixing some synchronization issues
Merge branch 'master' into unstable