Merge "Fix svace issue to nullcheck" into devel/master