remove warning
***NO_CI***
Merge TFS Changeset 1043