Update patches for 930504 and 961365