Thanks again for the work on this Shawn! I got this applied to master and 4.3. We'll need to plan out exactly when to drop the reuse of the non-post-commit listeners.