Merge "BUG-1687, BUG-1689 FIx belongs-to resolution in dependency resolver"