Colors shifted
Merge remote-tracking branch 'origin/newgen-kit' into newgen-keznikl
fixing nodeCnt bug (again)