T5334

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