Sync with work

Signed-off-by: Sayan Malakshinov aka xtender <xt.and.r@gmail.com>