fix items missed in cherry-pick