Erlang 17 merge almost complete