Merge pull request #11352 from dengqf6/nlbw