Missing commits from the cherry-pick