Merge branch 'master' into vinayakb/resource_management