Consolidated work plan on Maintenance

Summary
Consolidated work plan on Maintenance