Add listener which add header in response
Merge branch 'dev-bugfix'