T5348

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