Applied patch to fix feed field collection update issue
Merge into master