sputnik files from upstream/master