Merge FF85 network audit

Edited by Matthew Finkel