- Fix canRepair not being set true as default (#6936)  Closes #6934 and #6935