Merge "Fix kafka-events replay messages feature" into stable-3.1