Merge branch 'extract_info_rewrite'