non-standard-options.patch