Merge "changes: Split Feed.php into a class per file"