[*] Update for 5.1.x