Update to 3.16.4