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

* commit 'd3956321c173beb1fb096b5171e76ba7b7e1bc1e':
  Fix issue #8798662: NPE in...