Merge branch 'chore/elixir-1.11' into 'develop'