Update for 5.2.21