Merge pull request #3350 from jianhan-he/master

For release version