Merge changes from topic "update_docs"