Merge changes from topics 'add_config', 'fix_doc'