bug node load adds fix
Merge branch 'master' into develop