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

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