Branch for 2.0; add MAXIMU_RETRIES patch