Adding patches for 2.24.sunyc4 to 2.24.sunyc3