Created by: daming-lu

This PR is the same as Longfei's PR here. Just need to add fix test failure commit to fix the test