CSPACE-6266: Remove cyclic dependency in resource ordering.