T5232

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