Completed cheryy-pick.