Merge branch 'ebfe-fix-build-master' into rust-master