Implement better acking and nacking.
Merge remote-tracking branch 'origin/master'