Headers must always be a string.
Fixing test cases for delayed datasource.
Merge branch 'master' into crash
Merge branch 'crash' into miya-offline