Imported Upstream version 4.0.7
V4.0.7

Signed-off-by: Vlad <vg@vladgh.com>
Update changelog

Signed-off-by: Vlad <vg@vladgh.com>
Fix

Signed-off-by: Vlad <vg@vladgh.com>