Merge "Speed up the subscriber" into main