Merge "proper cleanup onDestroy" into oc-dr1-dev