[builder] Fix support of gwf node types
Merge remote-tracking branch 'origin/master'