Node path fix
Merge commit '0afeb18' into develop