Merge branch 'patches/marcus/file_sink'