plumbing

Signed-off-by: Itai Koren <itkoren@gmail.com>
Merge remote-tracking branch 'origin/master' into solution