Release cherry-picked version