#787 Checklist #6