integration 0.5.16.0 r23799