Missing files for #920