Sync with last master changes

Signed-off-by: ymesh <Yuri.Meshalkin@gmail.com>