Cherry-pick fricy/Dwarf-Therapist@b16fbd2