Merge "Deprecate specialized file errors in OutputPage and fix escaping"