Merge "Fix security SVACE issue" into devel/master