Patch release with shelve-rewrite code