am b528e251: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'b528e2511377b58f2c7e0d1046b3645a3716e0ab':
  Fix an NPE in recorrection
  Fix an NPE in recapitalize