T5353

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