revert to previous commit
preserve order when updating array colls
reyooz nodes where possible
Merge branch 'master' into peanut-butter