Merge branch 'update/phoenix-and-plug' into 'develop'