Author: Da Zhou <da.zhou@microsoft.com> (cherry picked from commit e0260417ade5568ae37dcc3753aea0d1e0fd701b)