Merge tag '4.19.0' into 5.x