T5360

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