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

* commit '2a44f8d102a60b1ccca780341cff0b0efb8f19ed':
  Fix issue #8798662: NPE in...