resourcemanager
Merge branch 'Jimmy'