Update to 0.6.395