T5180

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