Merge branch 'receiptdemos' into dev