Merge "Multiple fixes - Feed.java"