Merge "Fix Fortify Log Forging Issue"