T5203

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