T5380

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