Intermediate commit

Signed-off-by: Alexander Bochkarev <otnasa@gmail.com>