NBUCore 2.0.0
Merge pull request #5449 from rivera-ernesto/nbucore_2.0.0

NBUCore 2.0.0