Merge "Fix Fortify Header Manipulation Issue"