Fixed bug in repairing
Merge branch 'Release/MileStone2/Hotfix/timeout' of https://github.com/srnjcbsn/Beduin into Release/MileStone2/debug