Test case for 11889
Implement czchen-11889
Update data for 10889
Fix czchen-10889
Merge branch 'czchen/11889'

* czchen/11889:
  Fix czchen-10889
  Update data for 10889
  Implement czchen-11889
  Test case for 11889