[merge last] Feed bug fixes