I had suggested to make the changes you posted, but as I told you none of the technicians preferred to alter any circuits and/or safety mechanisms.
In addition, the wiring in the 840D control is different from the 810D(our control) one.