package_patch (simple version)

Cherry picking the earlier version of #1679 
Can we add to new_tests instead?