Document overridden functions
Merge
Merge branch 'document-overrides-merge'