Update to bcf34d804e7