Merge branch 'nnicstar-fixes'