Fixed merged issue
Merge branch 'next_fix_merge' into next

* next_fix_merge:
  Fixed merged issue