T5224

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