Test case for 11388
Implement czchen-11388
Merge branch 'czchen/11388'

* czchen/11388:
  Implement czchen-11388
  Test case for 11388