Merge "Fix socket mark parsing."