Towards proper use of resource managers (#4233)