Update to 3.4.5 taken from MC