THR-1214

@mertcetin, @hasegeli
http://jira.tart.com.tr/browse/THR-1214