Fix/1.0.x/integ 60