Merge "[genlist] apply r71140 with local enhancement"