HHH-8243 HHH-8329 - Avoid flushing in validity audit strategy
(cherry picked from commit f0bd12f823af3e5adec0978f7fc41b48d5c4e47c)