Merge remote-tracking branch 'github-stefan/ni' into ni-merge