[#68918916] Address @fureigh's comments