T5336

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