T5242

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