Handle complex types in NodeLayout
Merge branch 'master' into functions