Merge "Cleanup flag "manager_avoid_receiver_timeout"" into main