Merge pull request #642 from ariard/2020-06-anchor-backend-refacto