Merge branch 'master' into extract_fs_tree_section_recursive