MEDIUM: Fixed some issues for temporary compatibility with old resource
management system