Issues #2219051 and #2218839 Documenting important hooks