2.2.4
Merge branch 'hotfix/incorrect_store_receipts' into dev-forest