files merging with upstream stable 7