avoid deprecate and harmful global binding
Merge commit 'github/testing' into beta