[fb] Fix error when editing new file
Merge remote-tracking branch 'upstream/master' into testing-abe