Merge pull request #1905 from ambroise-arm/av/2.1-docs

Update user guide for 2.1 release