rebase: to upstream v2.1

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