Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev