Merge branch 'dev-erlang-bumps'