Fix for NaN x/y values on nodes
Merge remote-tracking branch 'origin/big-refactoring' into big-refactoring