Merge "Increase the service bind timeout." into main