fix covarity defects;
Merge remote-tracking branch 'origin/4.5.3' into 4.5.3