T5332

http://redmine.rocodev.com/issues/5332

http://redmine.rocodev.com/issues/5333