Merge: #5712: Preemptively fix some other possible timing issues.