Fixed 'Bug 12062 - Resolve and add reference is not clear'.
Updated nrefactory.