Merge pull request #424 from lkishalmi/nb112_enhancements

Nb112 enhancements