Merge "Fix logic in loading dependencies crossing namespace boundaries"