Align feed_model on master