fix root document node compilation
Merge remote-tracking branch 'upstream/master'