Merge "Destroy Allocation right away on exception" into oc-dev