Fixes in resource manager
Merge remote-tracking branch 'origin/master'