Merge "Avoid unnecessary exception handling for <include> tag"