Fix/4.0.x/integ 309