[gdrcopy/f35] Update to 2.3