Missing files for #4071