Merge "sfplugin: import buffers before metadata handling"