T5226

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