Adding patches for 2.24.sunyc3