T5290

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