Add these changes from WIP force merge of it.
Merge pull request #973 from ESwordTheCat/nBcWve1s

Add these changes from WIP force merge of it.