fix in payment reconciliation patch
Merge branch 'master' into edge