Merge branch 'backport-3.24-revert-vs-ZERO_CHECK-proj'