[dev1070] Repair system improvements

• [dev1070] Repair system improvements

  • Implementation of improvements to the repair system

-----
To hold a discussion and/or submit feedbacks on this topic, please use "dev1070" as a tag.