Pull PR into patch and fix `with_auditors` decoy