repare build 6.0.x