Other than this correction, the parts that can be put together in OR were corrected in fix_tab_completion_merge_v4.patch.
Kotaro Kawamoto