WIP 8

Signed-off-by: Andrei Dinin <adinin@pivotal.io>