Merge with default.

For meson build, delete marshallers and update name of resource file.