Ensure that catalog files are added to the native image #686
11 files changed