modify by user2
merge test-2.0-hotfix2