Merge "Add some logging to NDC." into jb-dev