Merge pull request #14392 from snipem/nbc-fix