patches for 0.40.14