T5347

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