Refactoring in IPN processors.
Merge branch 'master' into receipts