Merge stable-2.7 into stable-2.8