[merge] Adding some missing files