Merge "Fix potential access to invalid memory during shutdown" into oc-dr1-dev