Merge "Add Certification merge logic"