Merge "Fix issue #8798662: NPE in..." into jb-mr2-dev