Merge remote-tracking branch 'alexandre/ni-merge' into HEAD