Merge remote-tracking branch 'alexis/mnit-fixes-and-numbers'