Fixing dependencies between object types on the same resource (MID-1841)