T5339

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