Merge "ContentHandler: remove last wfRunHooks() call in includes"