DO NOT MERGE
Manually introduce changes from @naturalist