Merge "Fix svace issue, DEREF_AFTER_NULL case" into devel/master