Backport to nm-1-42 branch

Merged Wen Liang requested to merge wl/nm-1-42-2 into nm-1-42

Merge request reports