Fixes for shipment
Fixes for shipment


Former-commit-id: 1bdb3e78ffe491f3116bec956914a19bf5370260 [formerly c9afe6a27c85e406e676a1ef73c2e07c262058a7]
Former-commit-id: 2e9982567ed1ef5151a3d5917218b3332e89f42b
haste/ivar2,torhve/ivar2,torhve/ivar2,torhve/ivar2