rebase: to upstream v2.0

Signed-off-by: Anton Arapov <arapov@gmail.com>