Changes made by Galin Grozev (galin.grozev@telerik.com).