Merge "Add overlay configs for sending and enabling timeout" into main