fixed neck by removing the NKP definition
Merge remote-tracking branch 'origin/feature/logging' into merge/logging