[NL] resynchronized with 4cefec
Merge pull request #809 from Cpt-xx/nl_merges_with_4cefec

[NL] resynchronized with 4cefec