Added configuration changes
merged changes for delivery receipts