T5244

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