upd: Implement the patches for old bug 1288, and bug 1318