T5337

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