Merge remote-tracking branch 'eg-working/collab/phasefx/merged_bill_and_receipt_fixes'