added retries like in 3.4 to 3.5 upgrade