Merge branch 'fix-ni' into wip