NBUCore 1.9.7
Merge pull request #4920 from rivera-ernesto/nbucore_1.9.7

NBUCore 1.9.7