updated patches for 2.1-head