Final user guide changes
Merge commit 'd6808935f0d87192facbbdd62880764e851f2151'