Merge branch 'documentation' into raman/master_managix_doc