Pull fix-bte-copy into release branch