Changes made by Martin1 Yankov1 (Martin.Yankov@telerik.com).