Updated to upstream fd1a3351b387e97665530d1a8ad9c1efc2f9a24d