C-36549 Maintenance Helper