Rob Carr opened merge request !12: Resolve #3404964 "2" at project / site_audit

2nd attempt at MR - to correct branch