T5245

http://redmine.rocodev.com/issues/5245