Merge branch 'master' into extract_info_rewrite