Update to 1.20.4

Update to 1.20.4