Latest rebar with R17 error fixes