Add files that were forgotten in 6af798962810054fcf68f8e597de56b6490271a2, which is the re-apply of 950d9c8a567273c3363f43cee454f2b95a9f5da7