update based on 6.5.1.a-2013050502 and 6.5.1.a-2013051601