Fixes: 26866 [TFS Changeset #65734]
[TFS Changeset #65733]
Created 4.1.0 branch [TFS Changeset #55082]