Commit for Phase 1 Bug Fix - Certis