Checklist functionality for Production and QA
Conflicts resolved