T5181

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