adoption of the foreign data source interface
Linebuffer support in query
merge from the master