Documentation update

Documentation update
Merge branch 'develop' into feature-MX-98