More logging on response handling.
Merge branch 'master' into feature/backwards_compatibility