Merge 4.80.1 security fix in.