T5354

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