T5382

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