inject FromClient into correct buffer
Merge remote-tracking branch 'refs/remotes/origin/ARAKOON-420' into 1.6