Update to f3349aeb4947ae75d4993c5565a3f30c5589a8c0