Merge branch 'develop' into chore/elixir-1.11