Field collection table patch
File entity patch
Merge branch 'firsttry' into tickets