T5150

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