NBUCore 1.9.5
Merge pull request #4131 from rivera-ernesto/nbucore_1.9.5

NBUCore 1.9.5