Merge branch 'reassign_fixes' of https://github.com/R4PaSs/nit