[elixir/f17] (21 commits) ...latest upstream