Changes made by Steve Tsokev (Stefan.Tsokev@telerik.com).