Merged
This merge will primarily benefit tx propagation (which propagates by 25% every cycle); 95% will be propagated by 1 second to a single peer if cycle time is 50ms. With multiple peers this should make propagation a lot more reliable, faster, while potentially raising CPU load.