Applied patch from bug #2234
Reverted patch
Update ChangeLog
Applied patch from bug #2234
Reverted patch
Update ChangeLog
Merge to 2.0.7
Avoid throwing log info for the ID untagged response
Update ChangeLog
Merge to 2.0.7

Conflicts:
	ChangeLog