T5295

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