Fixed sequence in automating instantiations of node/class attachments
Merge remote-tracking branch 'origin/master'