Merge "Documenation updates"