Merge "BUG-1234 nodeType/ID in adaptors"