I have a 2019 MS that had a cracked motor gear just like what you all are describing. I machined a new gear with the flat on it to match the D shape on the motor shaft. Let me know if anyone is interested in purchasing a replacement gear from me with the D shape included.