Re-applied the patch required for mapping_options from Sydney-o9's fork