Merge pull request #12594 from hnyman/nlbw