Merge changes from topics 'c_doc_update', 'detached_cleanup'