Merge pull request #4709 from kdarbyshirebryant/nlbwmontweak