WIP 7

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