Merge "Add ParserFetchTemplate hook"