Bug fixes.
Merge remote-tracking branch 'origin/master'
Improvements of getNodeExternalData.