Minor fix

Signed-off-by: Vlad <vg@vladgh.com>
Imported Upstream version 4.0.5
Merge tag 'upstream/4.0.5'

Upstream version 4.0.5
Update changelog

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