Merge "Fix Fortify Scan Issue"