Merge branch 'ncsi-fixes'