NodeProcessor.java updated from master