Merge "BUG 907 distinguish augmented nodes"