gingerlime's cherry-picks to my fork