ready for modifying #10522 patch.
modify #10522-patch for problem3.
Merge branch 'problem3new' into integration-test
integration test.