T5300

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