Merge remote-tracking branch 'upstream/master' into trusted-remove_audit_logs

2 jobs for !418 with remove_audit_logs in 88 minutes and 30 seconds
latest merge request